From: Dave Airlie Date: Wed, 4 Dec 2013 23:18:25 +0000 (+1000) Subject: Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into... X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~7510^2~8 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=10c028e94e6e47dca88b33dcc7f9f16651e2cc90;p=linux-4.9.git Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes A couple of fixes. The biggest thing is the DMA buffer accounting that was incorrect. * 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux: drm/vmwgfx: Add our connectors to sysfs drm/vmwgfx: Fix dma buffer memory size accounting drm/vmwgfx: Fix up and comment the dumb buffer implementation drm/vmwgfx: Correctly set the enabled state on crtcs --- 10c028e94e6e47dca88b33dcc7f9f16651e2cc90